Update some a11y tests

diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index 9d64f17f2e28e1fcaaafd108a93d431cee71766f..9e049d1fe6171e3b3a5553ae0aaee0ba0c70311c 100644 (file)
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -1,7 +1,7 @@
 window1
   "window"
   index: 0
-  name: Page 1
+  name: 
   state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
@@ -12,7 +12,7 @@ window1
     "push button"
     parent: unnamed-GtkContainerAccessible-0
     index: 0
-    name: Page 1
+    name: Button 1
     state: enabled focusable sensitive showing visible
     toolkit: gtk
     <AtkComponent>
@@ -28,7 +28,7 @@ window1
     "push button"
     parent: unnamed-GtkContainerAccessible-1
     index: 0
-    name: Page 2
+    name: Button 2
     state: enabled focusable sensitive visible
     toolkit: gtk
     <AtkComponent>

diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index 1282061f94aae520533c763e98016369f495abdf..12b879bc32c83bcb73b9a3977ca149f775d2b369 100644 (file)
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -791,7 +791,7 @@ window1
                 <AtkValue>
                 minimum value: 0.000000
                 maximum value: 1.000000
-                current value: 0.000000
+                current value: 1.000000
               h_slider
                 "color chooser"
                 parent: grid
@@ -817,8 +817,8 @@ window1
                 layer: widget
                 alpha: 1
                 <AtkText>
-                text: 
-                character count: 0
+                text: #FFFFFF
+                character count: 7
                 caret offset: 0
                 default attributes: bg-color: <omitted>
                                     bg-full-height: 0
@@ -887,89 +887,25 @@ window1
                   parent: grid2
                   index: 0
                   name: Value
-                  state: editable enabled focusable horizontal sensitive single-line visible
+                  state: enabled focusable horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkText>
-                  text: 0
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkAction>
-                  action 0 name: activate
-                  action 0 description: Activates the entry
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
-                  current value: 0.000000
+                  current value: 100.000000
                 s_entry
                   "spin button"
                   parent: grid2
                   index: 1
                   name: Saturation
-                  state: editable enabled focusable horizontal sensitive single-line visible
+                  state: enabled focusable horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkText>
-                  text: 0
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkAction>
-                  action 0 name: activate
-                  action 0 description: Activates the entry
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
@@ -1077,43 +1013,11 @@ window1
                   parent: grid3
                   index: 0
                   name: Hue
-                  state: editable enabled focusable horizontal sensitive single-line visible
+                  state: enabled focusable horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkText>
-                  text: 0
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkAction>
-                  action 0 name: activate
-                  action 0 description: Activates the entry
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
@@ -1181,47 +1085,15 @@ window1
                   parent: grid4
                   index: 0
                   name: Alpha
-                  state: editable enabled focusable horizontal sensitive single-line visible
+                  state: enabled focusable horizontal sensitive visible
                   toolkit: gtk
                   <AtkComponent>
                   layer: widget
                   alpha: 1
-                  <AtkText>
-                  text: 0
-                  character count: 1
-                  caret offset: 0
-                  default attributes: bg-color: <omitted>
-                                      bg-full-height: 0
-                                      direction: <omitted>
-                                      editable: false
-                                      family-name: <omitted>
-                                      fg-color: <omitted>
-                                      indent: 0
-                                      invisible: false
-                                      justification: left
-                                      language: <omitted>
-                                      left-margin: 0
-                                      pixels-above-lines: 0
-                                      pixels-below-lines: 0
-                                      pixels-inside-wrap: 0
-                                      right-margin: 0
-                                      rise: 0
-                                      scale: 1
-                                      size: <omitted>
-                                      stretch: <omitted>
-                                      strikethrough: false
-                                      style: <omitted>
-                                      underline: none
-                                      variant: <omitted>
-                                      weight: <omitted>
-                                      wrap-mode: word
-                  <AtkAction>
-                  action 0 name: activate
-                  action 0 description: Activates the entry
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
-                  current value: 0.000000
+                  current value: 100.000000
                 label4
                   "label"
                   parent: grid4

diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index 16f1047a5736aa5673b6b3543d8d7d1bc2acdb62..efbe14e90e505e1c766b0cc42d16d0a2569c0db2 100644 (file)
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -292,44 +292,11 @@ window1
       parent: box1
       index: 6
       labelled-by: label3
-      state: editable enabled focusable horizontal sensitive showing single-line visible
+      state: enabled horizontal sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      <AtkText>
-      text: 46
-      character count: 2
-      caret offset: 0
-      default attributes: bg-color: <omitted>
-                          bg-full-height: 0
-                          direction: <omitted>
-                          editable: false
-                          family-name: <omitted>
-                          fg-color: <omitted>
-                          indent: 0
-                          invisible: false
-                          justification: left
-                          language: <omitted>
-                          left-margin: 0
-                          pixels-above-lines: 0
-                          pixels-below-lines: 0
-                          pixels-inside-wrap: 0
-                          right-margin: 0
-                          rise: 0
-                          scale: 1
-                          size: <omitted>
-                          stretch: <omitted>
-                          strikethrough: false
-                          style: <omitted>
-                          underline: none
-                          variant: <omitted>
-                          weight: <omitted>
-                          wrap-mode: word
-      <AtkAction>
-      action 0 name: activate
-      action 0 description: Activates the entry
-      action 0 keybinding: <Alt>s
       <AtkValue>
       minimum value: 0.500000
       maximum value: 99.500000

diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt
index c2837f41dbf2d2b3208ae5b91962594392dcc505..6a66719ddeb8877e0d99dfff3f36b75458ea5ee7 100644 (file)
--- a/testsuite/a11y/expander.txt
+++ b/testsuite/a11y/expander.txt
@@ -20,3 +20,41 @@ window1
     <AtkAction>
     action 0 name: activate
     action 0 description: Activates the expander
+    label1
+      "label"
+      name: Hello World!
+      state: enabled multi-line sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      <AtkText>
+      text: Hello World!
+      character count: 12
+      caret offset: 0
+      default attributes: bg-color: <omitted>
+                          bg-full-height: 0
+                          direction: <omitted>
+                          editable: false
+                          family-name: <omitted>
+                          fg-color: <omitted>
+                          indent: 0
+                          invisible: false
+                          justification: left
+                          language: <omitted>
+                          left-margin: 0
+                          pixels-above-lines: 0
+                          pixels-below-lines: 0
+                          pixels-inside-wrap: 0
+                          right-margin: 0
+                          rise: 0
+                          scale: 1
+                          size: <omitted>
+                          stretch: <omitted>
+                          strikethrough: false
+                          style: <omitted>
+                          underline: none
+                          variant: <omitted>
+                          weight: <omitted>
+                          wrap-mode: word
+      <AtkHypertext>

diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 2d82317c15afe8beb9d7415d994a5a178c1fe18c..ec3606f337a5b9dced0140bf723ce57164371d5c 100644 (file)
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -29,7 +29,6 @@ window1
       "menu"
       parent: menubar1
       index: 0
-      name: File
       state: enabled selectable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -38,7 +37,6 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: <Alt>f;<Alt>f;
       <AtkSelection>
       separatormenuitem1
         "separator"
@@ -55,7 +53,6 @@ window1
         "check menu item"
         parent: menuitem1
         index: 1
-        name: awesome
         state: selectable sensitive visible indeterminate
         toolkit: gtk
         <AtkComponent>
@@ -80,7 +77,6 @@ window1
         "menu item"
         parent: menuitem1
         index: 3
-        name: Quit
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -89,13 +85,11 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: q;<Alt>f:q;
         <AtkSelection>
     menuitem2
       "menu"
       parent: menubar1
       index: 1
-      name: Edit
       state: enabled selectable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -104,13 +98,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: <Alt>e;<Alt>e;
       <AtkSelection>
       imagemenuitem6
         "menu item"
         parent: menuitem2
         index: 0
-        name: Cut
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -119,13 +111,11 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: t;<Alt>e:t;
         <AtkSelection>
       imagemenuitem7
         "menu item"
         parent: menuitem2
         index: 1
-        name: Copy
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -134,13 +124,11 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: c;<Alt>e:c;
         <AtkSelection>
       imagemenuitem8
         "menu item"
         parent: menuitem2
         index: 2
-        name: Paste
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -149,13 +137,11 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: p;<Alt>e:p;
         <AtkSelection>
       imagemenuitem9
         "menu item"
         parent: menuitem2
         index: 3
-        name: Delete
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -164,13 +150,11 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: d;<Alt>e:d;
         <AtkSelection>
     menuitem3
       "menu item"
       parent: menubar1
       index: 2
-      name: View
       state: enabled selectable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -179,13 +163,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: <Alt>v;<Alt>v;
       <AtkSelection>
     menuitem4
       "menu"
       parent: menubar1
       index: 3
-      name: Help
       state: enabled selectable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -194,13 +176,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: <Alt>h;<Alt>h;
       <AtkSelection>
       imagemenuitem10
         "menu item"
         parent: menuitem4
         index: 0
-        name: About
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -209,5 +189,4 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: a;<Alt>h:a;
         <AtkSelection>

diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index b98486153ca9b3f613f6c166548079d577d9e0a8..d9893ab868b8b6cc151e31eb5a5c22501bc8095a 100644 (file)
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -35,7 +35,6 @@ window1
       "menu item"
       parent: menu
       index: 0
-      name: New
       state: enabled selectable sensitive visible
       toolkit: gtk
       <AtkComponent>
@@ -44,5 +43,4 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: n;;
       <AtkSelection>

diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index 0102a8829387cf94cfbf23de75fcd43f1c8e3a65..e5d8cbb537b1fb76d6c99bc196903a9307153607 100644 (file)
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -26,14 +26,13 @@ window1
     alpha: 1
     unnamed-GtkStackAccessible-2
       "panel"
-      parent: unnamed-GtkPopoverAccessible-1
-      index: 0
+      parent: unnamed-GtkWidgetAccessible-3
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-4
         "filler"
         parent: unnamed-GtkStackAccessible-2
         index: 0
@@ -42,36 +41,36 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-5
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-4
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-6
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-5
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-7
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-6
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-8
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-7
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible

diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index 0102a8829387cf94cfbf23de75fcd43f1c8e3a65..e5d8cbb537b1fb76d6c99bc196903a9307153607 100644 (file)
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -26,14 +26,13 @@ window1
     alpha: 1
     unnamed-GtkStackAccessible-2
       "panel"
-      parent: unnamed-GtkPopoverAccessible-1
-      index: 0
+      parent: unnamed-GtkWidgetAccessible-3
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-4
         "filler"
         parent: unnamed-GtkStackAccessible-2
         index: 0
@@ -42,36 +41,36 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-5
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-4
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-6
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-5
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-7
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-6
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-8
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-7
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible

diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt
index 9e06483c33785ffa1a748f2676801604c54a5997..ab89b99250a24aa1e13ae3abd3fc8baa2082ddc0 100644 (file)
--- a/testsuite/a11y/menus.txt
+++ b/testsuite/a11y/menus.txt
@@ -29,7 +29,6 @@ window1
       "menu"
       parent: menubar1
       index: 0
-      name: File
       state: enabled selectable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -38,13 +37,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: <Alt>f;<Alt>f;
       <AtkSelection>
       menuitema1
         "menu item"
         parent: menuitem1
         index: 0
-        name: New
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -53,13 +50,11 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the menuitem
-        action 0 keybinding: n;<Alt>f:n;
         <AtkSelection>
       menuitema2
         "menu item"
         parent: menuitem1
         index: 1
-        name: bla
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -84,7 +79,6 @@ window1
         "check menu item"
         parent: menuitem1
         index: 3
-        name: check item
         state: enabled selectable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -98,7 +92,6 @@ window1
       "menu"
       parent: menubar1
       index: 1
-      name: Edit
       state: enabled selectable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -107,13 +100,11 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the menuitem
-      action 0 keybinding: <Alt>e;<Alt>e;
       <AtkSelection>
       menuitem4
         "radio menu item"
         parent: menuitem2
         index: 0
-        name: radio1
         member-of: menuitem5
                    menuitem4
         state: enabled selectable sensitive visible
@@ -129,7 +120,6 @@ window1
         "radio menu item"
         parent: menuitem2
         index: 1
-        name: radio2
         member-of: menuitem5
                    menuitem4
         state: enabled selectable sensitive visible

diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt
index fdb59723146fab5c475fb8394231f215835eb91a..0b6d1dc6e4235309f81bd24a47fbc70283bce5b2 100644 (file)
--- a/testsuite/a11y/range.txt
+++ b/testsuite/a11y/range.txt
@@ -25,10 +25,6 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      <AtkValue>
-      minimum value: 0.500000
-      maximum value: 99.500000
-      current value: 45.500000
     scale1
       "slider"
       parent: grid1